From cacec65e9e410527f32b89a97a29c23d213724b2 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 1 Feb 2000 19:05:18 +0000 Subject: [PATCH] Add some sanity checks if the widget passed to gtk_drag_get_data() was not Wed Feb 2 11:58:05 2000 Owen Taylor * gtk/gtkdnd.c (gtk_drag_selection_received): Add some sanity checks if the widget passed to gtk_drag_get_data() was not the dest widget. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkdnd.c | 4 ++-- gtk/gtkfontsel.c | 9 --------- 9 files changed, 44 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 317ed087b2..9700b9a706 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Feb 2 11:58:05 2000 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_selection_received): Add some sanity + checks if the widget passed to gtk_drag_get_data() was not the + dest widget. + 2000-01-31 Yuan-Chung Cheng * configure.in: Added "zh_CN.GB2312" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 317ed087b2..9700b9a706 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Wed Feb 2 11:58:05 2000 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_selection_received): Add some sanity + checks if the widget passed to gtk_drag_get_data() was not the + dest widget. + 2000-01-31 Yuan-Chung Cheng * configure.in: Added "zh_CN.GB2312" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 317ed087b2..9700b9a706 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Wed Feb 2 11:58:05 2000 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_selection_received): Add some sanity + checks if the widget passed to gtk_drag_get_data() was not the + dest widget. + 2000-01-31 Yuan-Chung Cheng * configure.in: Added "zh_CN.GB2312" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 317ed087b2..9700b9a706 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Wed Feb 2 11:58:05 2000 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_selection_received): Add some sanity + checks if the widget passed to gtk_drag_get_data() was not the + dest widget. + 2000-01-31 Yuan-Chung Cheng * configure.in: Added "zh_CN.GB2312" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 317ed087b2..9700b9a706 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Wed Feb 2 11:58:05 2000 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_selection_received): Add some sanity + checks if the widget passed to gtk_drag_get_data() was not the + dest widget. + 2000-01-31 Yuan-Chung Cheng * configure.in: Added "zh_CN.GB2312" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 317ed087b2..9700b9a706 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Wed Feb 2 11:58:05 2000 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_selection_received): Add some sanity + checks if the widget passed to gtk_drag_get_data() was not the + dest widget. + 2000-01-31 Yuan-Chung Cheng * configure.in: Added "zh_CN.GB2312" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 317ed087b2..9700b9a706 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Wed Feb 2 11:58:05 2000 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_selection_received): Add some sanity + checks if the widget passed to gtk_drag_get_data() was not the + dest widget. + 2000-01-31 Yuan-Chung Cheng * configure.in: Added "zh_CN.GB2312" to ALL_LINGUAS. diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index 635834e222..a6fd6e95d9 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -1141,7 +1141,7 @@ gtk_drag_selection_received (GtkWidget *widget, site = gtk_object_get_data (GTK_OBJECT (drop_widget), "gtk-drag-dest"); - if (site->target_list) + if (site && site->target_list) { guint target_info; @@ -1166,7 +1166,7 @@ gtk_drag_selection_received (GtkWidget *widget, selection_data, 0, time); } - if (site->flags & GTK_DEST_DEFAULT_DROP) + if (site && site->flags & GTK_DEST_DEFAULT_DROP) { gtk_drag_finish (context, diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index 6e650a5bd7..8790c65b7d 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -2922,17 +2922,8 @@ gtk_font_selection_get_fonts (void) fontsel_info->nfonts = 0; for (i = 0; i < num_fonts; i++) { -#ifdef FONTSEL_DEBUG - g_message("%s\n", xfontnames[i]); -#endif if (gtk_font_selection_is_xlfd_font_name (xfontnames[i])) gtk_font_selection_insert_font (fontnames, &fontsel_info->nfonts, xfontnames[i]); - else - { -#ifdef FONTSEL_DEBUG - g_warning("Skipping invalid font: %s", xfontnames[i]); -#endif - } } -- 2.30.2